@@ -0,0 +1,12 @@ |
||
1 |
+# -*- coding: utf-8 -*- |
|
2 |
+ |
|
3 |
+from django.conf.urls import url |
|
4 |
+ |
|
5 |
+from page import info_views, oauth_views, sale_views |
|
6 |
+ |
|
7 |
+ |
|
8 |
+urlpatterns = [ |
|
9 |
+ url(r'^clerk$', oauth_views.clerk_oauth, name='clerk_oauth'), # 店员授权页面 |
|
10 |
+ url(r'^clerk/sale$', sale_views.clerk_sale_oauth, name='clerk_sale_oauth'), # 店员销售授权页面 |
|
11 |
+ url(r'^clerk/info$', info_views.clerk_info_oauth, name='clerk_info_oauth'), # 店员信息授权页面 |
|
12 |
+] |
@@ -18,16 +18,9 @@ Including another URLconf |
||
18 | 18 |
from django.conf.urls import include, url |
19 | 19 |
from django.contrib import admin |
20 | 20 |
|
21 |
-from page import info_views, oauth_views, sale_views |
|
22 |
- |
|
23 | 21 |
|
24 | 22 |
urlpatterns = [ |
25 | 23 |
url(r'^admin/', include(admin.site.urls)), |
26 | 24 |
url(r'^api/', include('api.urls', namespace='api')), |
27 |
-] |
|
28 |
- |
|
29 |
-urlpatterns += [ |
|
30 |
- url(r'^page/clerk$', oauth_views.clerk_oauth, name='clerk_oauth'), # 店员授权页面 |
|
31 |
- url(r'^page/clerk/sale$', sale_views.clerk_sale_oauth, name='clerk_sale_oauth'), # 店员销售授权页面 |
|
32 |
- url(r'^page/clerk/info$', info_views.clerk_info_oauth, name='clerk_info_oauth'), # 店员信息授权页面 |
|
25 |
+ url(r'^page/', include('page.urls', namespace='page')), |
|
33 | 26 |
] |
@@ -1,2 +1,2 @@ |
||
1 |
-nohup uwsgi --ini pai2.ini &>pai2.log & |
|
1 |
+nohup uwsgi --ini tamron.ini &>tamron.log & |
|
2 | 2 |
echo "Start Success !!!" |